am 47b8baa1: Merge "Change timer icon position" into ub-camera-everglades

* commit '47b8baa1b04e3da92b965b7d6b0929fc24ebc940':
  Change timer icon position