Merge "Add SystemApi USE_UNRESTRICTED_KEEP_CLEAR_AREAS"