In QuickStep, adding a placeholder ScrollView and changing the state logic appropriately to handle that Change-Id: I10223c0692788d6e5dbf8c408c01cafb4e39bd2c