Merge "Allow assist gesture when notification shade is expanded" into mnc-dev