Merge "Separate lock and home tab (2/2)" into udc-dev