Merge "Differentiate SystemUISharedLib library vs apk"