Merge "Fix that holding volume buttons to activate Extra dim feature doesn't do anything." into tm-dev