Merge "67913: Master/Details template with minSdk 13+ isn't optimized." into studio-1.0-dev