Merge "Make the edit activity fullscreen" into main