Merge "Update Keyguard to use RowContent / ListContent instead of SliceQuery where possible"