Merge "Remove warning compiling KeyguardLiftController"