Merge "Create its own Handler instance for persisting display brightness" into tm-dev