Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev