Merge "app: Remove silly usage of RAII_VAR."