Merge "Update keyguard presentation logic to take into account shade position" into main