Merge "Fixing issue with screen pinning not working. (Bug 17436123)" into lmp-dev