Merge "Check if an app requests POST_NOTIFICATIONS before setting state" into tm-dev