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