Merge "Miscellaneous fixes" into ub-deskclock-dazzle
am: ad9d3e6d83

* commit 'ad9d3e6d8317065bc4cade1947cee1b25388c4b8':
  Miscellaneous fixes