Merge "Remove keyguard state callback onViewDetached." into sc-dev