Merge "Avoid adding FORWARD_LOCK flag to an updated system app"