Fix missing edit preview

Bug: 72522
Change-Id: I16edec975a16a87f1f426d84dd126ac8aa83d90e
(cherry picked from commit f937dec06b385d5c02b974b9a28cb4e3d1ee7c45)
Fix edit section icon regression

Bug: 72484
Change-Id: Id3cbfbe5fd041781ef6ce1e9346d69e8978fafed
(cherry picked from commit 67fe4448fdb1796750726908c109807c9caac1e4)
Merge "Fix edit section icon regression" into wmf/1.25wmf5