Merge "Add new Wear setting for Lockscreen"