Merge "Wallet on lockscreen" into sc-dev