Merge "Fading in edit button much later" into rvc-dev