(cherry picked from commit 84a0044d512aacc99f9cd847e5e019fedb2b4ecf) # Conflicts: # app/src/main/res/layout/common_spinner_item.xml
(cherry picked from commit 84a0044d512aacc99f9cd847e5e019fedb2b4ecf) # Conflicts: # app/src/main/res/layout/common_spinner_item.xml