Merge "Fix issue where System UI crashing resulted in no unlock animation." into tm-qpr-dev