Merge "Fix app compat dashboard from settings app"