Merge "Developer option for the app freezer" into rvc-dev