Fixed issues on implementation for Screen Lock - Change device settings policy