Merge "Merge "Fading in edit button much later" into rvc-dev am: addcaf9f am: 108e9b1a am: d44f5b80" into rvc-qpr-dev-plus-aosp