Double tap to return to small layout
Merge branch 'double_tap'

* double_tap:
  Double tap to return to small layout