Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavailable
Bug 1037030 - fix multiple prompt race r=alive
Merge pull request #21709 from fabricedesre/perm-prompt

Bug 1037030 - fix multiple prompt race r=alive
Merge pull request #21911 from snowmantw/issue1036236

Bug 1036236 - [LockScreen] Unlock to Camera twice would make it unavaila...
Bug 1023819 - Follow-up, rename class to follow naming standards r=me
Bug 1038578 - [Collection App] Icons are not updated after installing hosted apps from marketplace