[automerger] Fixing various quickscrup controls for fallback activity am: 9829060491

Change-Id: I55e492ce9ab67125bffc7aafb9c4dbc30bc9e2e1