Merge "Update media visibility on lock screen" into tm-dev