Merge "Redirect calls to the secondary lockscreen methods to the SupervisionService" into main