Merge "Fix bug #16800261 Settings app: Device administrator screen padding issue" into lmp-dev