Merge "Don't allow concurrent permission requests." into mnc-dr-dev