Merge changes I7993fde3,Ia804fc9b into rvc-dev

* changes:
  Fixed the double tap behavior on the expand button
  Forced the expand button to be double tappable on the lock screen