Merge "Merge "Allow swipe up on unlocked dream." into tm-qpr-dev am: 5ef8b6f81c" into tm-qpr-dev-plus-aosp