Merge "DO NOT MERGE - Fixed an issue where the emergency affordance would show" into nougat-dev