Merge "Passing activityClassName when setting unlock controller" into main