Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev