Merge "[RCS] Refactor App"