9cff728d13
(cherry picked from commit c041410f61)
# Conflicts:
# app/src/main/res/layout/extension_detail_controller.xml